From 827887624b20adc2ecb21857000e2d0c204eb0e5 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Mon, 2 Oct 2017 18:06:32 +0200
Subject: [PATCH] Move shared logic into separated methods

---
 src/cargo/core/resolver/mod.rs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/cargo/core/resolver/mod.rs b/src/cargo/core/resolver/mod.rs
index fd16ccf13..45172a1dd 100644
--- a/src/cargo/core/resolver/mod.rs
+++ b/src/cargo/core/resolver/mod.rs
@@ -901,10 +901,16 @@ impl<'r> Requirements<'r> {
     }
 
     fn require_dependency(&mut self, pkg: &'r str) {
+        if self.seen(pkg) {
+            return;
+        }
         self.deps.entry(pkg).or_insert((false, Vec::new())).0 = true;
     }
 
     fn require_feature(&mut self, feat: &'r str, recursive: &'r Vec<String>) -> CargoResult<()> {
+        if self.seen(feat) {
+            return Ok(());
+        }
         for f in recursive {
             if f == &feat {
                 bail!("Cyclic feature dependency: feature `{}` depends on itself", feat);
@@ -929,17 +935,12 @@ impl<'r> Requirements<'r> {
                 self.require_crate_feature(feat_or_package, feat);
             }
             None => {
-                let feat = feat_or_package;
-                if self.seen(feat) {
-                    return Ok(());
-                }
-                match self.summary.features().get(feat) {
+                match self.summary.features().get(feat_or_package) {
                     Some(recursive) => {
-                        self.require_feature(feat, recursive)?;
+                        self.require_feature(feat_or_package, recursive)?;
                     }
                     None => {
-                        // This is a dependency, mark it as explicitly requested.
-                        self.require_dependency(feat);
+                        self.require_dependency(feat_or_package);
                     }
                 }
             }
-- 
2.30.2